From 29ac5b5d4cca00dc508ff42c91880ef666012532 Mon Sep 17 00:00:00 2001 From: Ryan Pavlik Date: Thu, 12 May 2022 16:48:46 -0500 Subject: [PATCH] Use Unifont from system Forwarded: not-needed Gbp-Pq: Name 04_use_system_unifont.patch --- res/CMakeLists.txt | 1 - src/resource.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index 30b577c..19650cb 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -288,7 +288,6 @@ add_resources( locales/ru_RU.po locales/zh_CN.po locales/ja_JP.po - fonts/unifont.hex.gz fonts/private/0-check-false.png fonts/private/1-check-true.png fonts/private/2-radio-false.png diff --git a/src/resource.cpp b/src/resource.cpp index 8921d7a..497ef38 100644 --- a/src/resource.cpp +++ b/src/resource.cpp @@ -669,7 +669,7 @@ size_t BitmapFont::GetWidth(const std::string &str) { } BitmapFont BitmapFont::Create() { - BitmapFont Font = BitmapFont::From(LoadStringFromGzip("fonts/unifont.hex.gz")); + BitmapFont Font = BitmapFont::From(LoadString("fonts/unifont.hex")); // Unifont doesn't have a glyph for U+0020. Font.AddGlyph(0x0020, Pixmap::Create(Pixmap::Format::RGB, 8, 16)); Font.AddGlyph(0xE000, LoadPng("fonts/private/0-check-false.png")); -- 2.39.5